Resolve Update Issues